Fixed typo.
Remove created ifs that are not required.
Refactored library.
Version bump.