Altered dependencies. Fixed #1. Opend #2