Fixes #16 #15