Adding support for aside format.
Committing master branch changes.