Fix timedout bug
Merge branch 'master' of github.com:uhray/crud