commit to master
Merge pull request #26 from n-ctrl/master

Commit to github