rebranching for better merge
Merge pull request #2 from dhxgit/prepar

rebranching for better merge