Fix Issue 18
Merge branch 'master' into public_demo_20130402