Added missing file from branch bug/1_error_500.
Updated version.
Merge branch 'dev'