last changes
merging
Merge branch 'master' of https://github.com/alonecuzzo/squirrel