Upgrade version

It passes all unit tests. Let me know if there are any problems.