Arne Redlich - 2013-07-03

Applied with your Signed-off-by (as discussed in #24) and some modifications (Makefile, whitespace issue in event.c) - svn rev. 495

Thanks,
Arne