Fix warnings
Fixes an overloaded virtual function warning
Merge pull request #45 from pixelballoon/feature/warnings

Fix non-virtual destructor warnings
Merge pull request #46 from pixelballoon/feature/warning-predelete

Fixes an overloaded virtual function warning
Merge branch 'master' into develop