Merge tag '0.5.2'
Merge tag '0.5.3'
update Gemfile.lock to reflect 0.5.3