Fix for simulated locations included
Merge branch 'simulation' of https://github.com/BeuthProjects/guts into simulation