Merge pull request #212 from rjynn/newBranch

merged my changes with erics