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

Handle first start gracefully
Merge pull request #95 from madevr/master

Handle first start gracefully...