Minor changes.
Merge branch 'master' of https://github.com/NCIP/rembrandt.git
More minor changes