Merge pull request #9 from ngs/develop

v2.1.0