Fixed issue #22
Merge pull request #23 from derkork/idea14

Fixed issue #22