Merge pull request #8 from adiknoth/fixes