Merge pull request #34 from Nonemoticoner/master

#5 #31