Fixes #4 #5