Should fix #2.
Refractored code.
Version bumped to v1.5.