Develop

This is 0.5 beta with lot of changes