ja/nee?? en ontdubbelen
Merge remote-tracking branch 'origin/master' into drukhetnu
Merge pull request #19 from Bixie/drukhetnu

Drukhetnu
Merge pull request #20 from Bixie/master

rebase from master