Minor changes for v1.1
Merge pull request #447 from blaine-O/v1.1

Minor changes for v1.1