Minor fixes

Signed-off-by: Lance Chen <cyen0312@gmail.com>
Merge pull request #11 from Lance0312/master

Minor fixes