Changed headers and implementation for ease of use
Added sorting function
Way to late last commit
Merged branches