Merge pull request #21 from Elefrant/master

Update