Brli/khopper — pull request #1 by Brli (2014-06-17 13:25:47+00:00)
Title: merge branch

to master