Merge pull request #17 from pkkup/master

moar good stuff