Merge pull request #137 from jackykschou/JackySprint11

Jacky sprint11
Merge branch 'develop' into JackySprint11