Merge pull request #9 from Exodia/master

sync