Version 2.1
Merge pull request #15 from pjkundert/master

Version 2.1