Merge pull request #20 from arago/master

update
start usability changes
Merge branch 'master' of https://github.com/viteke/rike
Merge pull request #36 from viteke/master

update