Merge pull request #406 from npodolak/patch-1