Merge pull request #29 from kbansal/alternatefix