Re-do #37 and address #99
ALL OF THEM... maybe?
Merge pull request #100 from ruebot/master

Re-do #37 and address #99