Making mode configurable
Merge pull request #74 from divideandconquer/master

Making mode configurable