Merge pull request #32 from oadan79/master

sync