Some changes
Merge pull request #18 from valeRB/master

 Some changes