Merge pull request #70 from drahnr/new-view-mechanics

Manual intervention was required