Merge pull request #8 from rackerjoe/master

Merged automatically by jenkins after successful build test