Updated to 0.9.6 release
Merge branch 'master' of https://github.com/Lone-Coder/asteria