Merge pull request #2 from Ludeon/master

sync
Corrected and updated to latest version
corrected
totally forgot that one
Corrected and updated to latest version
Corrected
Merge pull request #15 from Lunatico9/master

Major corrections and updates