Merge pull request #14 from Karnith/master

merge
Merge pull request #15 from Karnith/dev

Merge pull request #14 from Karnith/master