Merge pull request #1 from pnicorelli/dev

Dev merged!
just a step more.... saving work
just a step more.... saving work