Fixes issue #45. I need someone to commit YSI as I am unable to.