[0.4.7] Fixes #14 and fixes bugs