Merge branch 'stable'

Merge back changes for release 1.0
added categories feature to README