Some methods
Corrected attribute names
Merge remote-tracking branch 'origin/jan' into bruno