033-C Khongor
33-C Khongor (fix) merge. close #12
[auto] problems compiled