Merge pull request #4 from madre/master

sync