Elefrant/elefrant — pull request #22 by marsanla (2014-11-05 14:23:58+00:00)
Title: Merge pull request #21 from Elefrant/master

Update