Merge branch 'release/0.2.4-4' into devel
resuming work on ghostkiller
Fix for HTTP 504 error
Merge branch 'master' into devel
Fixed http 504 error
Merge branch 'release/0.2.4-5'