Stop CLI deleting original file
Merge branch 'master' into package
Package 0.5