local branch
Merge pull request #2 from ismaarten/bugfix/mijne

local branch