Some new features and improvements.
Merge pull request #3 from utdcsg/master

Some new features and improvements.