Re-ordered loop ordering for optimization
Merge branch 'master' of https://github.com/jholbrook7115/dolphin