Merged Joe Taleric's pull request #29