Lil changes, Fixes #23