Merge branch 'pull_request_67'
authorPiotr Dymacz <pepe2k@gmail.com>
Thu, 5 Nov 2015 19:20:16 +0000 (20:20 +0100)
committerPiotr Dymacz <pepe2k@gmail.com>
Thu, 5 Nov 2015 19:20:16 +0000 (20:20 +0100)

Trivial merge