Develop

In reverence to #24 and resolves #25