Changed constructor to make it simpler, why not
Merge pull request #24 from nickcolley/simplify-constructor

Changed constructor to make it simpler, why not