Merge remote-tracking branch 'origin/master' into 2.0
Merge branch 'master' into 2.0
Merge pull request #41 from franzose/2.0

2.0