Merge pull request #1 from david2dia/master

Master
Merge pull request #2 from david2dia/master

Fed Version
Merge pull request #3 from david2dia/master

Master
Merge pull request #4 from david2dia/dev

Dev