Fixes for release candidate 2#120

douglasdcm merged 2 commits intomaindouglasdcm/caqui:mainfrom

improvements-and-fixesdouglasdcm/caqui:improvements-and-fixesCopy head branch name to clipboard