Fix notices of 'Undefined index'
Closes #107
Merge branch 'issue/107' into develop