[master] things to merge added
[master] merged minor stuff