20130805

Doing changes to get the code working on ubuntu