Fixes for #295 #299 #300
Merge pull request #301 from gitcac/rc2

Fixes for #295 #299 #300