Merge branch 'addAttributes' into 'master'

Add attributes

Closes #23

See merge request !12
4 jobs for master
in 4 minutes and 55 seconds and was queued for 4 seconds