Merge pull request #18 from exbuddha/develop

Project Skeleton
Merge pull request #19 from exbuddha/develop

Project Skeleton
Project Skeleton