updated to current project state
Merge branch 'master' of https://github.com/unsigned-long/ROSE