Merge pull request #31 from mondora/master

Update.