Fixing errors of a bad merge. closes #44 and #45