Merge pull request #1 from emshon/master

fixes for driving the class
looks like this is done though I chose a different implementation than the official solution.
Merge pull request #2 from seanneal/master

pull down the latest