Develop

In reference to #24 and resolves #25