ninja-merge: added resume capabilities
Merge branch 'master' of github.com:danfruehauf/Scripts