browser fixes done
Merging issue-34 into develop and resolved conflicts