correct index diff
Merge branch 'master' into issue/aviary
Merge pull request #35 from etrom/issue/aviary

Issue/aviary