171-X merge. close #15
[auto] problems compiled