franzheidl Merge pull request #11 from omidfi/patch-1