Merge pull request #50 from rackerjoe/master

Merged automatically by jenkins after successful build test
Merge pull request #51 from rackerjoe/master

Merged automatically by jenkins after successful build test
Merge branch 'master' into havana