KINFOO/niko_niko — pull request #1 by lporcheron (2013-12-16 19:41:58+00:00)
Title: Several small imrpovements

As discussed, here is a merge proposal with some small improvements. Feel free to merge it or let me know if you want to discuss it.