Fixing #9 maintime

Fixes issue #9