Merge branch 'dev' of https://github.com/Redmain/Zwitterion into dev
Merge branch 'dev' of https://github.com/Redmain/Zwitterion into dev
Merge pull request #28 from Redmain/dev

Dev