Merge pull request #1 from xianyi/develop
authorMartin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Mon, 25 Jun 2018 18:45:56 +0000 (20:45 +0200)
committerGitHub <noreply@github.com>
Mon, 25 Jun 2018 18:45:56 +0000 (20:45 +0200)
Merge xianyi:develop into develop


Trivial merge