Changes for issues #47 and #54

This pull request fix these issues : #47 and #54

Should we keep just-in-case unused binaries such as "jamsj.jpg" or "smile_white.png" ?