kaievns Merge pull request #39 from dennisorlando/feature