Quick fix...
Merge pull request #77 from semirke/dev

Quick fix...