viteke/rike — pull request #15 by viteke (2013-05-24 09:34:57+00:00)
Title: update

merge