Merge pull request #13 from scarygliders/master

Bring devel version up to date with master.
Merge pull request #23 from scarygliders/devel

Merge pull request #13 from scarygliders/master