Merge pull request #10 from nickveenhof/master

Fix adding files and only escape files
Moved Nick's argument escaping code to a method in the abstract class, added it to the rm command as well.
Merge pull request #1 from cpliakas/master

Rebasing