Set results to return values when return is set, reformatted the code
Merge branch 'master' of https://github.com/Mekapaedia/appiont