Fixed #1063
Merge branch 'master' into refactor