increasing resolution
merging master