26.09.2014 - Code revision, refactoring, fixing bugs.