Fixed found issues
v0.0.4