* Initial commit of 1.0.5
Fixed merge.