Merge branch 'master' into working
Add todo note for fixing method return types
Add tests directory
Merge branch 'working'