Merge pull request #65 from Eyescale/master

Re-enable testing in Travis CI
Fix for, shadowing member variables
Merge pull request #67 from bilgili/master

Fix for, shadowing member variables
Fix one Wunitialized and related cleanups