Merge fix for #53 into dev