Fixes #6
Closes #8
Merge branch 'master' of github.com:dmacosta/ATableView
resolved conflicts