Merge pull request #36 from exbuddha/develop

Project Skeleton
Project Skeleton
Merge branch 'master' into develop