Merge pull request #4 from jsimonelli/master

Merging branches and changes from jsimonelli