A workaround for some of the problems of issue #59
Merge remote-tracking branch 'origin/master'