Add Docker support
Merge pull request #1130 from trevorbernard/master

Add Docker support