Bugfix
Issue #6
Merge pull request #8 from micovery/chill0r-work

Bugfix and Issue #6