add changes from crossjoin/Browscap
#5