Merge pull request #2 from bgamari/master
authorAndrey Mokhov <andrey.mokhov@gmail.com>
Fri, 18 Dec 2015 23:16:30 +0000 (23:16 +0000)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Fri, 18 Dec 2015 23:16:30 +0000 (23:16 +0000)
Various fixes


Trivial merge