tree dcfa4a7382d24b58930c31147c5a9cd93e6cef68
parent 897f8b654d8929e73fbeaa1b79f7ad2a88c7d2c6
parent e6743effc9eb908b2e8556c1e515b939f19cc0e1
author Petr Michalec <epcim@apealive.net> 1505901140 +0200
committer GitHub <noreply@github.com> 1505901140 +0200

Merge pull request #12 from AndrewPickford/master

Sync Andrew:master to develop