Fixes #5 #7