Merge pull request #1 from heppu/master

Update from original
merge from denzil