Fixing AL issues
Merge remote-tracking branch 'drewcrawford/master'