Merge pull request #1 from Settee/without-aside

Without aside