second commit
Merge https://github.com/pojtyk/2014_08_16
RRRRRRRRRRR