Fixes pt. 2
Merge pull request #12 from Vandenn/master

Fixes pt. 2