Merge pull request #98 from Ishap/master

Merging Bay master fixes
Merge branch 'master' of https://github.com/aztectornado/NSS-Phoenix