Merge pull request #14 from kebabkiller/master

merge