Make the project runnable from Eclipse #41 - some changes to the code