Cleaned code
Merge branch 'master' into trans