Began tidying up code and adding docstrings
Added docstrings where necessary to functions and classes
Merged dev into master using lazy method
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' into dev