Closes issues #3, #4, and Vladec/matching-engine#5
Merge pull request #6 from pylaterreur/master

Closes issues #3, #4, and Vladec/matching-engine#5