Merge pull request #1 from FransBouma/master

v1.2 dev started