pictures added
comments
minor changes on comments
merge of two masters-versions