fix #73
Merge branch 'master' into tags