Merge pull request #460 from ckpillai/master

SINGA-454 fix