Merge pull request #7 from MarkInvince/romik3

Romik3
last
Merge branch 'master' into mark
Merge pull request #8 from MarkInvince/mark

last
Merge pull request #9 from MarkInvince/mark

Merge branch 'master' into mark
Merge branch 'master' into romik3