Merge branch for fix for #502 - Unchecked calls