Merge pull request #20 from Baystation12/master
Merge branch 'master' of https://github.com/emmanuelbassil/NSS-Phoenix