Some updates
Merge pull request #2 from elip60/master

Some updates