Refactoring; new trigger on Pyora template
Merge branch 'master' of https://github.com/bicofino/Pyora