Merge pull request #8 from denizzzka/master

small fixes