Merge pull request #35 from anross/devel

Updating for 1.1.2 release