Merge up from dev to master

Fixing the broken link to ushadi.com