Merge
Merge branch 'master' of https://github.com/svenssonjoel/DefuncPush
Merge branch 'master' of https://github.com/svenssonjoel/DefuncPush
Merge branch 'master' of https://github.com/svenssonjoel/DefuncPush
Simplify the index function