Squashed changes and fixed version #99

More calculations and bug fixes in machine data