Ready
Merge pull request #3 from thleap/preparing-for-development

Ready