bug fixes #51 #54
after merge