Sync with lastest version from GitHub (851b8665aca7f5cc54f305f699333656a2406eeb).
Cleaning, removing of trailing whitespaces
Merge with latest updates by James