Fixes #269
Fixes #268
Merge remote-tracking branch 'origin/master'