Implementation for #434
Merge pull request #435 from AndyScherzinger/master

Implementation for #434