0.1.1 - removed custom attributes to resolve possible attribute name conflicts
Merge remote-tracking branch 'origin/master'