Updated de routines.
Merge branch 'master' into development