Merge pull request #362 from aparcar/patch-1