Add code from private svn

@javierlucio Update code from private repository