Dev master 1.0

Issue fixes for comments (#14)