kmfk Merge pull request #9 from zak956/master