mattt/Ono — pull request #12 by JanX2 (2014-04-19 18:25:27+00:00)
Title: Small fixes.

Please refer to the commit messages for details.