Fixes #3 #2