Merge pull request #2 from vskants/Reittiopas2

cvvvv
VVVVV
bb
Edited classes