Merge pull request #178 from samuelgarcia/apibreak

Apibreak