Began working on computing
Merge origin/master