Merge pull request #17 from lybeck/roope

Roope
Merge pull request #18 from lybeck/roope

Roope
Shitload of data (again..)