fixes issue #41
Fix issue #40
to all the heart haters out there (issue #42)
Completely fixes issue #33