Rewrite of library for 1.7.2. Javadocs coming soon