Various changes
Merge pull request #158 from mbeall/master

Various changes