API changes
Merge pull request #1 from nvcexploder/master

API changes