Merge pull request #190 from impaler/dev

Input refactoring
resize fix
Merge remote-tracking branch 'upstream/dev' into dev