API Changes
Merge branch 'master' of https://github.com/jwischnewsky/Mithra
API Changes, please give me some feedback if thinks need to be changed