Updated changes
Fixed tests for ccf429843ed8740e2a27ded53dac100dc8515afe
Renamed :create_dir option to :mkdir
Merge branch 'master' into 2.0