First commit
Improved API