Fixes #4
Merge branch 'master' into carlesfe
Reverted configuration changes
Merge remote-tracking branch 'origin/carlesfe'