Added type macros
Merge branch 'master' of https://github.com/asrivat1/DS_Final