timeout added
Merge branch 'master' of github.com:mhankowsky/magic