Merge pull request #2 from tshr/develop

Version 0.0.1
Merge pull request #3 from tshr/develop

Tests update
updated todo
update to do
fix merge conflict