All of Colin's Local Changes
Merge pull request #41 from ciaventures/mergeFix

All of Colin's Local Changes