commit code for v1.0.7
resolve merge conflict with code from boky
commit code for v1.0.8 - merged boky code and added url comparsion