Merge pull request #34 from ChrisBoesch/master

update
tags & badges update #4
Merge pull request #115 from LI-HE/master

tags & badges update #4