Cleaned the code.
Fixed potential bug
Updated version to 0.3