Rename variables and change data type to more closely match satin.c.
Merge pull request #2 from benalexau/master

Rename variables and change data type to more closely match satin.c.