pull from master and merge - this code has been modified a little bit. If you have conflict, I can help you to resolve them