Should close issue #46 if working