Merge pull request #9 from ShadowNinja/master

A few changes...