Refactored and bugfixing
Finished v0.1
Finished v0.2
Finished v0.2