Merge pull request #17 from Redmain/dev

Dev
Merge pull request #22 from Redmain/dev

Dev
Merge pull request #24 from Redmain/dev

Dev
Merge branch 'dev' of https://github.com/Redmain/Zwitterion into dev
Merge branch 'dev' of https://github.com/Redmain/Zwitterion into dev