Merge + Fixes #370