final update
Merge pull request #12 from zer969696/master

final update