Imported version 0.6.1
Merge pull request #1 from akiraohgaki/development

Imported version 0.6.1