small changes
Merge pull request #19 from hly89/master

small changes