Merge pull request #3 from protectedvar/feature

123
Merge pull request #4 from protectedvar/master

Merge pull request #3 from protectedvar/feature