Update in type and draka changes
Merge branch 'master' of github.com:Draka/mayorresponds