For Mata Garuda

Merge pull request #164 from pecastro/master

Some fixes to be able to create an RPM off the current head.