Fixes #17 #18