Version 2.1
Merge pull request #1 from smithg26/branch2

Version 2.1