Fixed issue #108
Merge pull request #153 from spark/bug-fixes

Fixed issue #108