Several changes. Additions, fixes, uniformity.

18gpbeAVjp1HoTomRoVoHPuHczAQaGWcVY
Merge pull request #52 from wickex/master

[DUTCH] Several changes. Additions, fixes, uniformity.