Fixed type (Thx Marijn)
Merge remote-tracking branch 'embolia/master' into nache_dev
error on configure fixed