Merge pull request #2 from centaurialpha/master

Updating