Bug fix merge Fixes #78