Fixed issues reported in #4 in addition DRY'ed a little bit
Fix issue with docker-py quirk using ID instead of Id
Merge pull request #8 from zefhemel/master

Additional fixes