Merge branch 'roni'

Work from 2014-02-22 hackathon