First build using standards-compliant object-orientated code. Made get_* methods static using decorators.
Merge remote-tracking branch 'origin/master'