commarch changes
Merge pull request #333 from nekocoder/master

commarch changes