Fixed #966
Merge branch 'master' into refactor