APS: bugfix, separation of features
Merge pull request #13 from gopher-snakes-2013/topics/index

APS: bugfix, separation of features