Merge pull request #1 from Jkrloz/master

a
Merge pull request #2 from sdomingu/master

Merge pull request #1 from Jkrloz/master