fix issue #66
further fix issue #66
reverse to original state
Added test file requested in issue #30
Merge branch 'issue_#30' of git://github.com/hart-wang/tocc into hart-wang-issue30