Merge pull request #251 from jshackles/dev

Build 5.1
Merge pull request #252 from jshackles/master

Merge pull request #251 from jshackles/dev