Fixed #7 and #3
Removed spurious