Resolved issue #69
Merge branch 'master' into stable