Bugfix (issue #19) fixed compilation warnings
Merge tag 'upstream/2013-07-02--git-9ed842f'