Commit 127aa48a96f55241a03305f72b606a999384ee54

Eugene Klyuchnikov 2015-09-01T12:18:22

Fix bug in decoder. Minor cleanup.