timeout and logging
Merge branch 'master' of github.com:lyogavin/Pistachio