Merge pull request #7 from spikey360/master

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

Fixed issue #11
Merge pull request #12 from arthasdk/master

well?