fixed March 17th reopening of issue 19
Merge branch 'master' into issue62
merging in fix for reopening of issue 19