Merge pull request #1 from ofca/master

merge master repo
parseInt small fix
Merge pull request #22 from kallosz/apply-parseInt

parseInt small change