Merge pull request #14 from bikeNomad/master