Fix #47

http://screencast.com/t/xz9G121pYV