Merge pull request #1 from jjaspe/master

a