GA fixed #71
Merge branch 'master' into release