20140724_2

New class and some updates