REALLY fixing the bug this time...I hope
Merge branch 'working' of https://github.com/steve-wilson/mySQL into working