Merge pull request #26 from exbuddha/develop

Project Skeleton
Merge pull request #27 from exbuddha/develop

Project Skeleton
Project Skeleton
Merge branch 'master' into develop