Merge pull request #155 from arn354/patch-2