Remove redundant files
Update Dockerfiles
Merge pull request #66 from nacyot/develop

Update base images