Merge pull request #13 from willkelly/master

Merged automatically by jenkins after successful build test