Updates
Merge branch 'master' of https://github.com/h2r/oberlin_detection

Merging abstract with local changes
Total revamp.