fixes #284

partially fixes #284 

![screenshot from 2013-09-12 17 24 57](https://f.cloud.github.com/assets/452811/1132736/b4aa76cc-1bd0-11e3-9e85-b47dbb7322b9.png)
![screenshot from 2013-09-12 17 25 09](https://f.cloud.github.com/assets/452811/1132737/b4c5729c-1bd0-11e3-88e1-7e49dcef9396.png)