Fix #53
Merge pull request #54 from sourceLair/issue-53

Fix #53
Fix #61

Also made some code styling improvements
Merge pull request #62 from sourceLair/issue-61

Fix #61
fix #56
fix #49

Increase container_id size from 32chars to 80
fix #22

Added timeout option to containers