Merge pull request #378 from ostephens/develop

First pull request against Develop!