#22 implemented
fixes and closes #20