Merge pull request #192 from willkelly/master

Merged automatically by jenkins after successful build test