Issue Fixes for Dev master 1.0 #14