Merge master
Updated documentation, compressed 3 cells into 1 for clarity
Merge pull request #4 from gajomi/refactor_inference_engine

Refactor inference engine