coding fallacies fixed
fixed driver issue
fixed merge errors
Merge pull request #32 from swarage/master

coding fallacies fixed