Small Bugfix.
Major code refactoring and performance improvement.