Fixes #31 and ends #32