Bug fix.
Merge pull request #5 from christav/dev

Bug fix.