Merge pull request #23 from flubbes/update-1

merge update-1 into jordi
Merge pull request #28 from flubbes/update-1

merge update-1 into jordi
Merge pull request #36 from flubbes/jordi

merge jordi into update-1