130925
Merge branch 'programming'