added new issues
merged with master