Merge pull request #2 from vialab/master

pull yo
Merge remote-tracking branch 'erik/master' into working