Fixing major bug with David's changes
Merge pull request #73 from mk200789/master

Fixing major bug with David's changes