Fixed editing
Improved styles
Merge pull request #1 from shishigami87/master

Update develop