Package association fixed. Closes #116. Closes #117