working on a few stuff...
Merge branch 'master' of https://github.com/MusiWiz/jasiwiz.git