Merge pull request #2 from seleregb/master

mkn