Use indexing instead of get_mut since it now returns an Option
Merge pull request #169 from jamesrhurst/master

Use indexing instead of get_mut since it now returns an Option