Update to use interface values
Merge pull request #9 from PreetamJinka/issues/7

Update to use interface values
Merge pull request #10 from PreetamJinka/develop

Merge develop into master