Patch 2013-12-02 Igor Oliveira
patch from @tonikitoo