Refactoring constructor usage and exports

 - Resolves issue #8
 - Resolves issue #11
Merge branch 'topic/fixing-constructors'