Merge successful!
Added some basic documentation