Adding IP detection and tidying
Trying to match changes, ptherwise will need to merge
Merge branch 'master' of https://github.com/timripley/DynamicCounter