Updated Sources to 0.4

See commit details for each change