Pulling in changes from live project
Version bump to 0.2.0