Added various functionalities to the software
Merge origin/master