Merge pull request #46 from rackerjoe/master

Merged automatically by jenkins after successful build test