Refactoring
Merge branch 'jpopsuki' of https://github.com/rhengles/ari-fw into jpopsuki
Refactoring