Merge pull request #66 from kvesteri/SA-0.9.6

Add support for SA 0.9.6