lstrojny Merge pull request #39 from uuf6429/patch-1 …