Mission Complete
Merge pull request #80 from igemsoftware/Victor

Mission Complete
Merge pull request #83 from igemsoftware/master

Master into Cao