reem Merge pull request #8 from huonw/less-static …