Merged in 4 pull requests + feature to have more characters in parameters

Please merge into develop and then merge this as well into master :) thanks