fixes #13 #5