Code syntax correction
Merge branch '2014-05-02-hotfix'
0.2.3