Made changes and test code for multiplexing
Merge pull request #11 from rkevingibson/master

Added support for multiplexer, and added some testing code