Druotic/expertiza — pull request #5 by Druotic (2014-11-04 12:05:37+00:00)
Title: Bulk of rafactoring changes/fixes

Huge number of changes, see commit messages.