Testing3

Modified 2, added 1 file.
Merge pull request #1 from hhintikk/heli's-branch-2

Testing3