...
Merge branch 'master' of github.com:Acagamics/Acagamic-Toolkit
changed naming conventions