Merge pull request #8 from GorjanGOA/master

merge