Fixes #6 in master