fix th bug #93
Merge branch 'master' into ted