Merge pull request #2 from tvlooy/master

updated from fork