fixing issues #54, #55, #56 and #57