Adjustments for the final release
Merge branch 'master' of https://github.com/maxi-jp/project_chandra