Merge pull request #3 from drasticactions/master

Updating against master.