p1tz/rike — pull request #6 by p1tz (2013-05-28 13:20:10+00:00)
Title: merge

merge