refactor and tagging as 0.1.0