Pr319 and fixes#321

cavedave wants to merge 6 commits intoail-project:masterail-project/ail-framework:masterfrom

cavedave:pr319-and-fixescavedave/ail-framework:pr319-and-fixesCopy head branch name to clipboard