Merge pull request #14 from glennlopez/master

sync