Merge pull request #45 from Nonemoticoner/master

#43 News