removed pry
Merge branch 'development'