Fixed issue #48, #49