Added new feature



<!---
@huboard:{"order":6.0}
-->