Merge pull request #37 from exbuddha/develop

Project Skeleton
Merge branch 'master' into develop