Fixes #7 #6 #5