Merge pull request #8 from plomakin/master

Improvements in Dockerfile.