Merge pull request #11 from bgamari/master
authorAndrey Mokhov <andrey.mokhov@gmail.com>
Sun, 20 Dec 2015 20:15:12 +0000 (20:15 +0000)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Sun, 20 Dec 2015 20:15:12 +0000 (20:15 +0000)
Fix fallout from previous refactoring


Trivial merge