Merge branch 'develop'
Updates as of 06042014:
Merge branch 'master' of https://github.com/hdemby/zonetools into develop