Merge spion's PR as 0.0.7