Merge pull request #65 from bhaktinarvekar/docker

latest changes including docker integration