First commit. Major update from the previous version. Some new functionality has been added as well as the code has been improved and also some bugs have been fixed