Fixed issue #46 and implemented #45