Merge pull request #1 from ehaydenr/master

3/31