Squariing tasks added.
Merge conflicts resolved
Merge pull request #1 from metaplinius/master

squaring intergration