Fixes #49 #58