Minor style fixups.
Access namevar through the resource method, rather than the instance variable directly, FIX: #1
Merge remote-tracking branch 'origin/master'