Merge pull request #6 from ChungwaSoft/master … 

Applied patch from fjaeger.
latest commit febebe2bc0
@drotiro authored