Fixes #100 #102