Merge branch 'feature/improve-microformats' into 'develop'