New macros
Added base CD code
Merge branch 'master' of github.com:daeken/Melinda