Issue 676

Getting https://github.com/DroidPlanner/droidplanner/pull/929/files ready for a merge