Merge pull request #24 from michaeldever/master

Standardize attribute names, update filters, tidy up.