Fixes #6 #8