Merge pull request #2 from rilwis/master

merge to origin
Merge pull request #3 from rilwis/master

update
define version
Merge pull request #502 from potterywp/master

bugfix version