- Fixed #35 and created useful constructors