Fixed limit problems
Merge branch 'development'