Merge pull request #3 from Runecat/master

stuff