almost done
almost done
Merge branch 'master' of https://github.com/pcarrasqueira/STR
almost done