Improve architecture for better API; fixes
Version 0.1.0 - stable release