Merge pull request #1 from Settee/without-aside

Without aside
Merge pull request #2 from Settee/master

Merge pull request #1 from Settee/without-aside