hohoho #2

Fixes #2
Merge pull request #4 from barosl/master

MERGING HOHOHO