fixes #26
fixed invalid tests
Hotfix - ignoring annoying .DS_Store files.
Merge pull request #27 from ciberch/hotfix_issue_26

fixes #26
merging issue_18 into master.