Merge pull request #2 from phinze/master

Update fork from original