fixed default values and added test coverage
rebase
updated version