changes made in airpair session

Hi Alejandro,
Thanks for the airpair. Here is a pullrequest so you can easily merge in the changes we made.
Greetings, GeertJohan