Fix #39, Version set
Refactored, typo fix
Refactored