Merge pull request #16 from keisetsu/develop

Merge the latest from keisetsu.
Merge branch 'develop' of https://github.com/mangalam-research/salve into develop