Code cleanup
Merge origin/master