final update
Merge pull request #13 from zer969696/master

final update