updated attributes
Merge branch 'master' of github.com:jrfoell/demo