Finished pull request 1 by squashing
Merge pull request #3 from matthewmccullough/release_2.0

Finished pull request 1 by squashing