Replace usage of docker.io with docker
Resolve conflict after merging with Tim's PR
Merge pull request #15 from akbargumbira/master

Resolve conflict after merging with Tim's PR