Minor Changes
Attributes broken
Merge remote-tracking branch 'alvaro/master'