Merge branch 'Develop'
Merge branch 'master' of https://github.com/miWebb/miRaptor