Fixes pt. 3
Merge pull request #13 from Vandenn/master

Fixes pt. 3