Changed core logic, now more flexible
Merge branch 'master' of https://github.com/nthrnth/jii