Merge pull request #395 from way2muchnoise/1.7-update

updates for the microscope and fixes #393