Updates to the API, still fixing bugs
Merge branch 'master' of https://github.com/ufieeehw/IEEE2015