updated code
Merge pull request #2 from shopgirl284/aefix

Updated code