Merge pull request #4 from kalua85/master

merge