added stuff that was missing on last premature commit
Merge pull request #58 from NicolasKessler/master

added stuff that was missing on last premature commit