Configurable main
Merge pull request #13 from infinityb/master

Configurable main