Merge pull request #393 from casperklein/patch-1