working edition
Merge branch 'master' into romik6
Merge pull request #18 from MarkInvince/romik6

Romik6