Changed type tostring functions
Fixed naming
Merge branch 'develop' of https://github.com/antonijn/acc into develop