Added idx columns
Merge branch 'master' of https://github.com/jan-gliniorz/swa.git