closes #340 (again)
Merge remote-tracking branch 'origin/master'