Issue 68 fixed

Hard coded indexes refactored to constants.