Merge pull request #1 from futurice/master

Update
Refactored hard coded indexes to constants
Merge pull request #71 from robotti3/issue68

Issue 68 fixed