merge code

Commits on Nov 04, 2014