Merge dev into master
Fixed bug where the first character of the index-string was used for paths in composition building instead of the first digit
Fixed bug where the first character of the index-string was used for paths in composition building instead of the first digit