Dev testing of yonghaoy:keyword-169 before pull request to dryad-master

Fix of yonghaoy:keyword-169 commit, for testing on dev.