Fix issue#1
Merge branch 'master' into stable