rstiller/dockmaster — pull request #33 by rstiller (2013-09-08 17:12:24+00:00)
Title: Feature/infrastructure definition

fixed #5 and fixed #6