Merge branch 'master' into searchConstruction
Merge branch 'searchConstruction' of
https://github.com/swt14w01/JRMDS.git into searchConstruction