Merged more changes from toushay