More robust
Also rake server:run is more robust now
Merge pull request #45 from korczis/devel

Devel => Master: Long time pull request