Fixes #36
Edited to comply with submission guidelines. Closes #36.
Merge branch 'feature-youarehere' into develop