various changes
latest version
Merge pull request #2 from reekoheek/master

Merge from reekoheek/xin