- Fix bug.

Signed-off-by: vn3352 <vn3352@bommerdesign.com>
Merge branch 'develop' of github.com:quangthi90/SongNguyen into develop