Cleaned code
Table sorting allowed
Merge origin/master