Merge pull request #188 from Cazra/customStatusMarkers

Fixed CustomStatusMarkers to allow markers to be saved, and set/unset…