Merge pull request #9 from vivekmgeorge/vivek

Vivek
Merged the changes from upstream master
Merge branch 'master' of https://github.com/red-spotted-newts-2014/bike-path into vivek