User interface enhancements.
Minor performance improvement.
Merge pull request #19 from diantahoc/master

Improvements.