[master] fixed makefile for gabo.
Merge branch 'master' into encription
[encription] about to test encription.