Merge pull request #21 from oadan79/master

sync