Merge pull request #2 from madre/master

sync