refactoring to latest interface changes
Merge pull request #15 from wick-ed/master

reviewed diff and tested locally with 0.6.0