PRs #880 and 881

[Carlos Rovira]

Hi,

can we merge PRs #880 and #881?
let me know if all is ok to do it, or others can do it
thanks

-- 
Carlos Rovira
http://about.me/carlosrovira