Fixed issue #16
Removed the unnecessary if statement
Merge pull request #24 from novoselrok/issue16

Issue16