Removed unnecessary Generic classes
Release version 0.1.2