Merge pull request #16 from nromanen/master

Merge
must done order
22-12 11am
created ordering
23.12
before merge
merge 4.48 23.12