Fixed #81

Fixed problem with settings of a different project = the first commit.  
Improved readability in the second one.