made corrections mentioned by sam in pull #14