Merge remote-tracking branch 'origin' into develop
Cleanup Scalariform settings
Merge pull request #21 from kazuhira-r/develop

Cleanup Scalariform settings