Added more features
Merge branch 'master' of https://github.com/Swampy821/PhoenixIRC