Merge pull request #1 from cikorka/develop

Develop
wip
removed theme
Merge remote-tracking branch 'origin/master'
updated doct string
wip
Merge branch 'master' into develop