Removed long calls.
Merge branch 'develop'