Updated 1.8.2014 4:28
Merge of dev0.04 into master