Fixes issue #24 and #25
Fixes issue #24 and #25

DanThrane/tekvideo.sdu.dk,DanThrane/tekvideo.sdu.dk,DanThrane/tekvideo.sdu.dk,DanThrane/interactive-videoes-grails,DanThrane/tekvideo.sdu.dk,DanThrane/interactive-videoes-grails