Fixing stuff.
Merge pull request #18 from Eegras/master

Fixing stuff.