Features ordered by name
Merge remote-tracking branch 'upstream/master'
Merge pull request #23 from SupunS/master

Features ordered by name