Merge pull request #2 from skyscreamer/master

sync