SMP compatibility
Merge pull request #22 from amedw/master

SMP compatibility