Fixes #3 #4