Merge pull request #4 from Daikatana/development

Development
Merge branch 'development' of https://github.com/Lakon/PiN into Lakon-development
Merge branch 'Lakon-development'