Merge pull request #1 from brainstorm/master

Latest merge from Enze