Simplify code
Basic tests
Version bump, 0.1.3