Merge pull request #18 from avsm/master

Improve make instructions
Add a Dockerfile