Merge pull request #11 from PetterS/dev

Windows fix.
Update to due to header file name change in SPII
Remove compile warning.