could you also add '!', which is also a reserved character?
http://tools.ietf.org/html/rfc3986#section-2.2