2.1.1 updates
Merge pull request #50 from khawkins/211_updates

2.1.1 updates