Fixes for issue #134

Fix compilation on Windows with Visual Studio 2010

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>