Fixed double folders.
Resolved conflicts.
Merge pull request #3 from JZorz/master

Fixed double stuff, runtime errors...