Fixes pt. 4
Merge pull request #14 from Vandenn/master

Fixes pt. 4