Merge pull request #12 from oadan79/master

sync
Merge pull request #13 from oadan79/master

sync