Solved all known bugs.
merge