Merge pull request #41 from lefta/master

Bonus tests + minor corrections
update ls error handling