fix #70
Merge branch 'master' into tags