Update from upstream (errbit/errbit)
Merge pull request #4 from lokalebasen/update-from-upstream

Update from upstream (errbit/errbit)