Merged API Changes

[Christofer Dutz]

Hi all,

I just wanted to tell you that I just merged the API refactoring branch back to 
master ... so now the API changes are live.

Chris