Added @author
Merge branch 'master' of https://github.com/emanuelsaringan/trapiKO