Bug fixes; new dependencies
Version 2