a lot of big changes
Merge pull request #49 from o2Labs/issues

a lot of big changes