Merge pull request #112 from rising-thunder/cilop

Cilop
Fixes #108
Merge branch 'master' of https://github.com/rising-thunder/rasr