SPCITY-35
SPCITY-27
SPCITY-38
Version bump to 1.0.11
version bump
Merge branch 'bugs'
Version bump to 1.0.12
merged in bug fixes