initial from fork
Merge pull request #1 from xvdiff/master

initial from fork