s6juncheng Merge pull request #10 from c-mertes/bugfix