Ready for 1.2.1 release
Merge pull request #108 from anross/devel

Ready for 1.2.1 release