enhancement: added unittests #55
enhancement: fixed #56