Merge pull request #3 from protectedvar/feature

123