Added not totally random init
Merge conflicts
Merge branch 'master' into AWS
removed drawing module for AWS