closes issues #79