viteke/rike — pull request #23 by viteke (2013-06-10 16:21:08+00:00)
Title: sync

merged