Merge pull request #68 from rising-thunder/cilop

Fix bugs
Fixes #69
Merge branch 'master' of https://github.com/rising-thunder/rasr