resolves #18
Merge pull request #25 from dszeto/develop

resolves #18