Merge pull request #4 from AlexMaxseiner/master

new stuff