Merge pull request #2 from jsjv/master

sync changes