Updated version 2013-05-01

Based on latest Taskpaper