Merge pull request #2 from mola/master

merdge and update