Committing changes so I can pull.
Adding several changes, tests, and bug fixes
Adding my changes and fixed merge files