Fixes pt. 5
Merge pull request #15 from Vandenn/master

Fixes pt. 5