attempt to disregard ip spoofing error
Merge branch 'development'