fixed #73, tests updated