Merge pull request #130 from elgreco84/master

Swift unit testing and updated to framework
Merge remote-tracking branch 'upstream/master'