Bug fixes

Fixes issue #55 
this should only be in development