Merge pull request #22 from pstephen43/master

sync up
Merge pull request #23 from pstephen43/master

sync up
the new wiring update
Merge pull request #208 from K-McK/master

sync up