using same methods used by validator
resolving conflicts
Merge branch 'master' of https://github.com/sacjaya/siddhi-3