Remove ending / in NANO_OBJ, replace 'test xVAR = x'  with 'test -z', replace 'grep > /dev/null' with 'grep -q'
Merge remote-tracking branch 'upstream/master'
Fix test -z usage
Merge pull request #4 from ocochard/master

Somme little changes