Merge pull request #16 from justinliucs/master

Merge from base project.
bug fix. configurations show in correct order now.
Merge pull request #34 from lostcharlie/master

bug fix. configurations show in correct order now.