Merge pull request #5 from jsuich/master

Take it bitches