Issue #334
Merge pull request #335 from jeremystone/master

Issue #334