API interface change
Merge pull request #4 from nov/master

Pull upstream changes