Jan21 Cleaned up code
Merge branch 'test_branch' of https://github.com/riadix/dukerama into test_branch