Squashed commit of the following:

commit 4cbb2e9a9077c2d7d84d8a5a9f93b154f8c5e251
Author: Daniel Gasparotto <gaspar@Daniels-MacBook-Pro.local>
Date:   Tue Aug 26 15:35:24 2014 +0200

    adding 3

commit d6cc50b179260106d6622cf5062b8178718677d6
Author: Daniel Gasparotto <gaspar@Daniels-MacBook-Pro.local>
Date:   Tue Aug 26 15:34:09 2014 +0200

    adding 2