full project as of Dec 2013
commit merge