Initial changes to make it work on my (ubuntu 13.04) machine