Merge fix for #4 from Dev