Feature/zen 9268 2

![screen shot 2014-10-14 at 23 33 35](https://cloud.githubusercontent.com/assets/2837923/4640613/bf9a6a14-5424-11e4-80ce-ecdf3f455dd6.png)