Merge update
Merge pull request #1 from Pahtet/master

merger update from pavel