we have had a problem with my previous merge with abarakov. some abarakov's changes has been reverted.
i have to revert some(mine) of that changes.
Merge branch 'development' of github.com:kewgen/aow into development