Fixed issue #11
Merge pull request #8 from spikey360/develop

Fixed issue #11