fixed bug identified in in issue #359 following suggestion by Rachel.
Merge branch 'master' into #359
updated CHANGELOG for bug fix
(#359)
Merge branch 'master' into #306