Commit 152e33c3a0a58a306d2ec208e0c71c92b11f99f6

Eugene Klyuchnikov 2015-11-17T13:45:41

Add more explicit type conversions. Remove dead code. Fix includes.