NSUInteger as int warning
Removed deprecated method calls
Merge branch 'feature/no_warnings' into develop