Fixed bug
First commit of 5v branch
rebase with master