added new awesome feature
merged with master