Merge pull request #14 from wick-ed/master

reviewed diff and tested locally with 0.6.0
refactoring to latest interface changes