Merge pull request #16 from fk-lx/patch-1