Fixes #28 #27