with all files...
Merge pull request #26 from dmichiels/error

with all files...