fixed map to fullsize
merge of branch master into local master