ASL2.0 license and copyright 2014
fixes related to PR comments