Resolve issue #15
Merge pull request #16 from ikirker/master

Resolve issue #15