Merge pull request #13 from scarygliders/master

Bring devel version up to date with master.