Duplication fixed
Merge branch 'master' of github.com:cslab-uprrp/toa