development-team/2 — pull request #173 by keskival (2014-02-07 21:27:44+00:00)
Title: The first fixes. Will continue later.

Will continue later at some point.