Merge pull request #2 from Meneth/beta

Reintroduced fixes
fix for d_tangiers