Version 1.4.1 finished. Added some code for version 2.0.0