general merge to master branch #22

Closed tmkasun closed 10 years ago