Merge pull request #72 from pioardi/issue-62-rewrite-to-typescript