Mildly refactored code, with tests and travis-ci
Merge pull request #1 from ArmedGuy/strict

Mildly refactored code, with tests and travis-ci