Merge pull request #31 from NicerHugs/master

big changes