Merge pull request #1 from jsjv/master

sync up