Merge pull request #36 from wardi/canada-v2.0

fix for 500 error on HTTP-ACCEPT: text/plain
fix for 500 error on non-int int query parameters