workaround for issue 206 and issue 204
Merge branch 'master' into 0.4.6a