Merge pull request #6 from andrewmichaud/master

fixstuff