Made slightly more modular
Version bumped up to v1.4.0