20130523 Commit

Add functions