added test, bug fixing
added test, bug fixing