Hai

Merged with Ryan's code

added 66 commits

• 5fc735fe...7944c819 - 65 commits from branch master
• 2a55efad - Merge branch 'master' into 'hai'

Compare with previous version

merged

mentioned in commit 4c8f7761