Fixes
More features
More testing and features
Added more freatures
Merge pull request #1 from Deseteral/feature-new

New features