Merge pull request #24 from AADOJ/Sisso

Sisso
Revert "Sisso"
Merge pull request #25 from AADOJ/revert-24-Sisso

Revert "Sisso"
fuu
Merge branch 'master' into develop
Merge pull request #39 from AADOJ/develop

Develop
bugs in gui fixed
fixing minor bugs in GUI