Restored missed parts
Removed unused feature
Merge pull request #20 from MarcoDeBortoli/release/1.4

Release/1.4