Merge pull request #289 from alberts/master

Fix compile error in Eclipse 4.3.