Use [[ ]] for optimisation + fix detection of extra arguments + bump version