Fixes #4 #3