Fixes #13 #16