Merge pull request #155 from SWvheerden/patch-1