Merge pull request #82 from igemsoftware/master

Master into Cao
OfficalUpload_py2java
Merge pull request #83 from igemsoftware/master

Master into Cao
OfficialUpload Complete
Merge pull request #84 from igemsoftware/Cao

Cao