fix issue #47
Merge branch 'master' into tax