Final functionality
Merge branch 'master' of github.com:luizsgpetri/hackthon_seckit