add 20131220
Merge pull request #2 from MedibaWorkshop/feature/issue-010

add 20131220