fixed
updated with Autumn's work
Merge pull request #64 from FarhadG/autumn

Autumn