Merge pull request #19 from diantahoc/master

Improvements.