changed init arrangement
circle
force completed
force completed
Merge branch 'dev' into gh-pages