Merge pull request #1 from wgallios/dev

Updates from Dev
Merge pull request #2 from wgallios/dev

Reaching alpha version