Improved Unity integration

This also fixes #6