Test cases / fixes for #137 and #131
Make sure we have test for both vars
Merge pull request #140 from therabidbanana/master

Fixes for #137 and #131