FIX. #248
Merge pull request #257 from SlavaRa/ASGenerator-fixes

FIX. Issue #248