This did the trick for my to fix issue #113 would be glad for a  review though