OSDN Git Service

Merge basic-improvements-branch to trunk