Commit from jlbb
Merge branch 'master' of https://github.com/ajnebro/Riatec2013
Merge branch 'master' of https://github.com/ajnebro/Riatec2013