added timeout to serial connection
Merge branch 'master' of github.com:meal/makerland