Merge pull request #516 from jialinsun/master

milestone for alert interface
fix some issue