Testflight 2.1.3
Merge pull request #1 from Memoto/master

Testflight 2.1.3
Merge pull request #2 from hermanolsson/master

Testflight 2.1.3