.
merged
Bug fixes to get it working on Ubuntu again