Alright, Alright, Alright!  This seems to work so far, still need
to add more test cases though.
Merge remote-tracking branch 'origin/master'