Updated to compile with 42deaa5e4 - references instead of moves or copies in a couple of places, explicit copy traIt only where needed. ImageIndex derives Copy because of warnings
Merge pull request #3 from okey/master

Work with 42deaa5e4 nightly.