Merge pull request #4 from kalua85/master

merge
Merge pull request #5 from kalua85/dev

Merge pull request #4 from kalua85/master