Fixed bugs. Final Release! v2.0