fixes #4 and #5