Merge pull request #3 from pstephen43/master

Sync up before 11/12 session
work to optimize some of the current functions
Merge pull request #61 from K-McK/master

optimization changes