fixed intendation changes
fixed 64-bit warnings
Merge pullrequest \#33 from 'vokalinteractive-master'
version bump
Merge pull request #2 from jaydee3/master

update to latest from upstream