bug fixing and passing unit tests to close #48