Add #65
Merge commit '77826aaa931147d69342ea1a4432d2afa6dc2f0c'
Correct #66
Correct IndexMissingException for first use, #66
Merge branch 'master' into dvl