20130520 Commit

Add functions