Merge pull request #27 from pflannery/dev

Various minor fixes and enhancements