Handle first start gracefully
Merge pull request #94 from madevr/madevr

Handle first start gracefully