Refactoring FTW
documenting changes
(\ /)
(O.o)
(> <) Bunny approves these changes
Merge branch 'update'