One new feature and Bug fix
Merge branch 'pbruna-master'