Merged from keebs add-dockerfile branch