AWD-3

This is not important.
Merge pull request #1 from pcora/AWD-2

AWD-3