init commit
remove .idea
some style changes
merge with master