fixes and closes #47
fixes and closes #47
Fixed Merge Conflict
fixes #46
fixes and closes #46