Merge pull request #2 from viktorg/dev

I made even more changes
Renamed file

Change-Id: Ibf056e946c58cf9be55ef7f067a8393781369182