Merge pull request #1 from yunasc/master

!
Test
Test
Test
Test
Fix types.
Merge remote-tracking branch 'origin/master'
Merge pull request #2 from VictoRD11/master

Fix Types.