Merge pull request #5 from EntropyWorks/master

clean up
Merge remote-tracking branch 'upstream/master'