Merge pull request #93 from milimetric/develop

Merging Develop into Master
Merge remote-tracking branch 'wikimedia/master'