Merge pull request #25 from versates-inc/master