Merge pull request #30 from i3mainz/master

merge