Xinqi Bao's Git

Merge pull request #32 from R41z/master
authorAaron Marcher <[email protected]>
Thu, 29 Dec 2016 22:27:57 +0000 (23:27 +0100)
committerGitHub <[email protected]>
Thu, 29 Dec 2016 22:27:57 +0000 (23:27 +0100)
several bugfixes and general improvements, see commits below.


Trivial merge