version 2 in progress
Merge branch 'master' of https://github.com/templar92/SquareSpec