cleaning
merged with master branch