primera version. work in progress
wip
Merge remote-tracking branch 'origin/master'