Improving compatibility with Excel 2013.
Merge branch 'develop'