Merged changes
Merge branch 'master' of https://github.com/MrClement/KenTraveler.git