Merge pull request #299 from tyszja/master
authortexane <texane@gmail.com>
Tue, 10 Mar 2015 18:05:48 +0000 (19:05 +0100)
committertexane <texane@gmail.com>
Tue, 10 Mar 2015 18:05:48 +0000 (19:05 +0100)
Minor error reporting tweaks and redundant  includes removal


Trivial merge